-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[build] Check if patches are applied before applying patches. #13566
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
liushilongbuaa
requested review from
qiluo-msft,
xumia and
lguohan
as code owners
January 31, 2023 08:04
liushilongbuaa
changed the title
[build] Check if quilt applied before quilt push
[build] Check if patches are applied before applying patches.
Jan 31, 2023
liushilongbuaa
added
Build
Request for 202012 Branch
Request for 202106 Branch
Request for 202111 Branch
For PRs being requested for 202111 branch
Request for 202205 Branch
Request for 202211 Branch
labels
Jan 31, 2023
xumia
approved these changes
Jan 31, 2023
liushilongbuaa
added
Request for 202012 Branch
Request for 202106 Branch
Request for 202111 Branch
For PRs being requested for 202111 branch
Request for 202205 Branch
Request for 202211 Branch
and removed
Request for 202012 Branch
Request for 202106 Branch
Request for 202111 Branch
For PRs being requested for 202111 branch
Request for 202205 Branch
Request for 202211 Branch
labels
Feb 2, 2023
xumia
approved these changes
Feb 3, 2023
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Feb 6, 2023
…net#13566) Why I did it If make fails, we can't rerun the make process, because existing patches can't apply again. sonic-net#13386 missed some change.
Cherry-pick PR to 202211: #13690 |
@liushilongbuaa PR conflicts with 202205 branch |
liushilongbuaa
added a commit
to liushilongbuaa/sonic-buildimage
that referenced
this pull request
Feb 10, 2023
…net#13566) Why I did it If make fails, we can't rerun the make process, because existing patches can't apply again.
8 tasks
yxieca
pushed a commit
that referenced
this pull request
Feb 10, 2023
#13761) Why I did it If make fails, we can't rerun the make process, because existing patches can't apply again.
mssonicbld
added a commit
that referenced
this pull request
Feb 12, 2023
mssonicbld
added
Included in 202211 Branch
and removed
Approved for 202211 Branch
Created PR to 202211 Branch
labels
Feb 12, 2023
liushilongbuaa
added a commit
to liushilongbuaa/sonic-buildimage
that referenced
this pull request
Apr 14, 2023
…net#13566) Why I did it If make fails, we can't rerun the make process, because existing patches can't apply again.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Approved for 202205 Branch
Build
Cherry Pick Conflict_202205
Included in 202012 Branch
Included in 202205 Branch
Included in 202211 Branch
Request for 202012 Branch
Request for 202106 Branch
Request for 202111 Branch
For PRs being requested for 202111 branch
Request for 202205 Branch
Request for 202211 Branch
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why I did it
If make fails, we can't rerun the make process, because existing patches can't apply again.
#13386 missed some change.
How I did it
Check if patches are applied. if yes, don't apply patches again.
How to verify it
Which release branch to backport (provide reason below if selected)
Description for the changelog
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)